Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 10:02:47 +0000 (02:02 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 10:02:47 +0000 (02:02 -0800)

Trivial merge